summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2022-12-13 02:21:30 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2022-12-13 02:21:30 +0100
commit0ed80c98182dac1bd3e6b1390af64c9d6959598c (patch)
treee11ad68920ce576d011be4bfc300b44221a70aa9
parentMerge pull request #9398 from liamwhite/fail (diff)
downloadyuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.tar
yuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.tar.gz
yuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.tar.bz2
yuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.tar.lz
yuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.tar.xz
yuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.tar.zst
yuzu-0ed80c98182dac1bd3e6b1390af64c9d6959598c.zip
-rw-r--r--src/yuzu/configuration/config.cpp2
-rw-r--r--src/yuzu/main.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 722fc708e..90fb4b0a4 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -697,7 +697,6 @@ void Config::ReadRendererValues() {
ReadGlobalSetting(Settings::values.fsr_sharpening_slider);
ReadGlobalSetting(Settings::values.anti_aliasing);
ReadGlobalSetting(Settings::values.max_anisotropy);
- ReadGlobalSetting(Settings::values.use_speed_limit);
ReadGlobalSetting(Settings::values.speed_limit);
ReadGlobalSetting(Settings::values.use_disk_shader_cache);
ReadGlobalSetting(Settings::values.gpu_accuracy);
@@ -1328,7 +1327,6 @@ void Config::SaveRendererValues() {
static_cast<u32>(Settings::values.anti_aliasing.GetDefault()),
Settings::values.anti_aliasing.UsingGlobal());
WriteGlobalSetting(Settings::values.max_anisotropy);
- WriteGlobalSetting(Settings::values.use_speed_limit);
WriteGlobalSetting(Settings::values.speed_limit);
WriteGlobalSetting(Settings::values.use_disk_shader_cache);
WriteSetting(QString::fromStdString(Settings::values.gpu_accuracy.GetLabel()),
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index b11b26f7b..6c204416f 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1790,6 +1790,9 @@ void GMainWindow::ShutdownGame() {
AllowOSSleep();
+ // Disable unlimited frame rate
+ Settings::values.use_speed_limit.SetValue(true);
+
system->SetShuttingDown(true);
system->DetachDebugger();
discord_rpc->Pause();